From afce31650cd3b797f68564f2bfab6fa9154b38f8 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Mon, 15 Dec 2025 22:58:34 +0100 Subject: [PATCH] adblock: update 4.4.5-2 * fixed f_uci function * fixed f_switch function, reported in the turris forum Signed-off-by: Dirk Brenken --- net/adblock/Makefile | 2 +- net/adblock/files/adblock.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index d525dfbc20..60163f8914 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=4.4.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 445108d096..c1b4cb1237 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -531,7 +531,7 @@ f_rmdns() { f_uci() { local config="${1}" - if [ -n "${config}" ]; then + if [ -n "$(uci -q changes "${config}")" ]; then uci_commit "${config}" case "${config}" in "firewall") @@ -1027,11 +1027,11 @@ f_switch() { elif [ "${status}" = "paused" ] && [ "${mode}" = "resume" ]; then if [ "${adb_dnsshift}" = "0" ] && [ -f "${adb_backupdir}/${adb_dnsfile}" ]; then mv -f "${adb_backupdir}/${adb_dnsfile}" "${adb_finaldir}/${adb_dnsfile}" - f_count "switch" "${adb_finaldir}/${adb_dnsfile}" + f_count "final" "${adb_finaldir}/${adb_dnsfile}" done="true" elif [ "${adb_dnsshift}" = "1" ] && [ ! -L "${adb_finaldir}/${adb_dnsfile}" ]; then ln -fs "${adb_finaldir}/${adb_dnsfile}" "${adb_dnsdir}/${adb_dnsfile}" - f_count "switch" "${adb_finaldir}/${adb_dnsfile}" + f_count "final" "${adb_finaldir}/${adb_dnsfile}" done="true" fi fi @@ -1040,7 +1040,7 @@ f_switch() { f_jsnup "${mode}" f_log "info" "${mode} adblock service" else - f_count "switch" "${adb_finaldir}/${adb_dnsfile}" + f_count "final" "${adb_finaldir}/${adb_dnsfile}" f_jsnup "${status}" fi f_rmtemp -- 2.30.2